Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Dec 2011 11:11:54 +0000 (03:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 24 Dec 2011 11:11:54 +0000 (03:11 -0800)

Trivial merge